055dde7dfc15ff3de66a78b621844ad6f8c68174,hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java,TestAdmin1,testMergeRegions,#,1362

Before Change


      assertEquals(3, admin.getTableRegions(tableName).size());
      regionA = tableRegions.get(0);
      regionB = tableRegions.get(1);
      admin.mergeRegionsAsync(regionA.getRegionName(), regionB.getRegionName(), false);
      Thread.sleep(1000);
      assertEquals(2, admin.getTableRegions(tableName).size());

After Change


      regionA = tableRegions.get(0);
      regionB = tableRegions.get(1);
      // TODO convert this to version that is synchronous (See HBASE-16668)
      admin.mergeRegionsAsync(regionA.getRegionName(), regionB.getRegionName(), false)
          .get(60, TimeUnit.SECONDS);

      assertEquals(2, admin.getTableRegions(tableName).size());